Formatted classes and cleaned up code
Forgot to add .class files, next commit will add /bin/ to .gitignore