Extra checks, first part cleanup