Some slight code cleanup