Added javadoc-style comments