Improved parse code.
Changed the name of the error to stop conflicts.
Remove unnecessary code.
Merge branch 'feature/improvements' into develop