Optimization changes

As suggested by Google Page Insights