Keep refactoring