Cleanup

Cleaned up code by:

 - Whitespace normalization
 - Removal of unused code
 - Adding of (empty) javadoc comments (need to be filled in)