another small code cleanup