Minor changes
Small optimization