Formatting and Refactoring