Refactoring, parser decls fixed
Refactoring, parser decls fixed