remove a lot of comments and update javadoc