Minor code cleanup for readability