Cleanup detail (33/48)

Cleanup detail