Added javadoc and check for tags