Furter refactorings