Minor code cleanup,