Formatting and code organization