minor changes (javadocs and some redundant variables)