Cleanup detail (25/48)

Cleanup detail