- Reorder the methods so they are closer to run order.
- Reindent the code to match style guide.