Convention over, time to clean up.

Convention over, time to clean up.