Formatting and organization changes

order of this class:
1. fields
2. overridden methods
3. public methods
4. private methods
5. private classes