Cleanup detail (26/48)

Cleanup detail