Rearranging some check functions and comments