Tweaks after code review