refactor, javadoc removed