Moving type validation to isValid method only