review code and refactor notes