Cleanup detail (46/48)

Cleanup detail