Add comments and genereate Javadoc