Change indentation from 4 spaces to 2
Fix some formatting
Cleanup Javadoc, fixes #3
Resolve Checkstyle errors