clean up check a bit