Issue #13 - even more code review changes