Minor code cleanup/clarification