[REFACTOR] Dry lexer a bit