Cleanup detail (9/48)

Cleanup detail