Clean up

Nice and tidy.