Addressed code review comments

Thanks @dthielman