Updated Refactoring-notes