Cosmetic stuff
Added more Validation