some small changes per code review comments