fix indent
dont use deprecated api
lexer & parsing rework
fixing parsing whitespaces