tidy points noted in code review