Clean up the checks a bit