Minify, restructure