Slight code cleanup