Addressed feedback from @rynowak