Addressed code review comments.

Still don't have all the validations requested yet. Will follow up with another commit.