Notes and improvements from code review