Minor parser refactoring
Run scripts from command line