ENH: Cleaning up checks