Refactoring creep classes