Cleaning up, fixing and added javadoc.
More cleanup
Auto-formating every file in src