Cleaned up validation lines in models