Very minor additional refactor
Very minor refactorying