Cleaned up validation messages a little