Minor optimization work