A load of unnecessary but clean changes. Note to self: Config still needs updating.