Issue #61 More code review comments