Code Cleanup

- Making methods smaller / breaking into multiple methods for clarity
- Minor fixes to comments