Tidy verification code