Updated REFACTORING Notes [ci skip]