Code Formatting + Refactoring