Formatted code more
  - Cleaning up implementation code
  - Fixing Javadocs