try to clean up a bit