Issue #28: code review fixes