NOJIRA Refactoring scanner class hierarchy