addressed comments from @adamrp and @eldeveloper