Improvements after code review for #208