Minor code cleanup; two lines better than 5