fixed more commments from @ericsnowcurrently
Addressed comments by @anastaciamac