Cleanup detail (30/48)

Cleanup detail