Clean up of shape creation code.
Merge branch 'master' of github.com:tsherif/tareksherif