[#354] Tweaks from first round of code review