Changes based off of code review comments.