Refactored code task added