Refactoring # 14