Clean up and re-minify