Minor refactoring and javadoc improvements