Minify, minor cleanups