Minor optimization
Minor optimization