Cleanup detail (28/48)

Cleanup detail