Optimisations and Cleanup
Merge branch 'master' of https://github.com/NoZip/ParkerProject