Combined Notes for refactoring done

file "changes.docx"