new task on refactoring (in progress)