Refactoring:
- Make big functions into smaller ones
- Clean up event handlers
- Change function def conventions
- Change variable declaration conventions
Merge branch 'refactoring'