Deleted a print statement
Improved names. Minor tweaks
Merge branch 'develop'