Clean up

Redundant `:ensure` blocks, moving some things to `:config` blocks, some reformatting.