Javadoc + Minor refactoring