Fixed review comments from ChrisGuzak.