Adding parser validator
Cleanup