Clean up code organization