Several enhancements
Minify