Done refactoring