completed javadoc
removed unused assignments