Refactoring 007