Improved code and performance
New name is stripped