Cleanup
Removed some parse init redundancy