Cleanup detail (35/48)

Cleanup detail