service aspect refactoring; javadoc