cleanup
more cleanup
refactor
cleanup
Merge branch 'refactor'
Forgot to pull from remote before making changes, merging the two