Add further improvements for minification