implemented Jim's suggested changes
Merge branch 'master' of https://github.com/mkknts35/csci331_a0.git