Addresses comments.

Will merge before submit.