clean up
make parser to ignore strings
TODO: separate logics