Cleans up code organization.