Minor changes based on feedback

TD had some feedback on the last pull request, this addresses some of it.