Minor modifications and clean-up for javadoc documentation