Cleaned validation class

[Spidermonk4n3]

Could have used an expression body but line length reduced readability