making suggested changes based on marcosnils feedback and comments