Cleans up the code

* Removes commented methods
* Updates javadoc