Minor code cleanup
Released 8.2.4