minor performance changes