Addressed review comments from Nathan.