make updates per code review and spec change