Cleanup detail (32/48)

Cleanup detail