Cleanup detail (29/48)

Cleanup detail