small tweaks after code review