Applied changes as requested in the reviews. Ready for review round 2.