Problem 10879 solved, 'Code Refactoring'