Initial swap of commenting code for javadoc