Small refactorisations and adjustments