Refactoring solution added.