Code Refactor - Whitespace Refactor