tweaking couple of code review suggestions