Try to clean up a bit