cleaned up the validation results and fixed where as whereas