Very minor refactorying