refactoring / javadoc in core module