Code optimations (javadoc + some other stuff)