Comments and small refactorisations