7 Refactoring, improvement spec