Oct 10 code review

As per our conversation.