Added javadoc as per earlier code review