small optimization updates