Some additional code cleanup