Refactored HumParser

Refactored HumParser