remove comments from Model.java, add javadoc's