Cleanup detail (24/48)

Cleanup detail