Incorporating steve's comments
Cleaning up and pushing Steve's changes