Refactoring covers