Fixing snowleo's comments on my last PR