Issue #66 Fixed code review items