Added refactor notes