10879 - Code Refactoring