Minified and moved a few things around