Cleanup detail (42/48)

Cleanup detail