Styling Refactor: Using astyle from new style guide to refactor.