Minor tweaks after code review