Cleanup detail (22/48)

Cleanup detail