Clean up check a little