Clean-up code organization