Cleanup detail (27/48)

Cleanup detail