Cleanup detail (34/48)

Cleanup detail