Refactorise a bit