667 Refactoring
667 Refactoring