Cleanup detail (23/48)

Cleanup detail