* Code cleanup
* Javadoc
* Complete some methods