Addressed code reviews.

Cleaned up some code to prepare for a merge.

* Code clean up