Doing some cleanup

Might have to do more - Intellij seems to like reformatting my code.