clean code more again and again
add some code to the validation class