refactored and wrapped the two handlers for javadoc and method into a single handler