(Issue #2562) Code clean-up from review