Improved javadoc
Improved code formating