(Issue #315) Code clean-up from self-review