Refactoring HomeWork # 6