Integrated changes and improvements from my pair programming partner