Refactoring - task-1546