Commit some changes for review

Submitting my code review