Cleanup detail (47/48)

Cleanup detail