cleanup, javadoc
cleanup, removed unused assignments, javadoc all parameters/throws