Cleanup detail (18/48)

Cleanup detail