refactoring for oss.sontype.org