addressed some code review comments