refactoring
parsing more tokens