Refactoring 006