Cleanup detail (36/48)

Cleanup detail