Cleanup detail (37/48)

Cleanup detail