Move some stuff and tidy.