Taking the validation a step further plus cleanup