A minor code cleanup