Move inspection into util