Fix comments, code and add javadoc to different class