Minor improvements
Minor improvement