Added Refactoring Note [ci skip]