Refactoring - add notes