Improvements Lexical Analizer

Getting tokens in a better way