Committing review comments from Tom