Cleanup detail (7/48)

Cleanup detail