Cleans up a bit