Cleaning up so it's slightly less The Worst