Added code review comments -- Tom