#298 - updates from code review