Just clean up a bit