javadoc, cleaned some things