making a few changes based on Jason recommendations