Code Refactoring (III) -Removed Handlers to rely on Parsers