refactoring
make app use viter
parser refactoring
removed redundant function
removed TODOs
refactoring