Cleanup detail (6/48)

Cleanup detail