Addressed comments from @ericsnowcurrenlty