Refactor request parsers