Small refactorisations following Jeremy's comments
Small refactorisations following Jeremy's comments