lexer 2 simplified

pls @JanTvrdik review previous code and make it work ;)