Commenting and some javadoc