slight code cleanup