minor optimization updates