Code refactor part II [validation][started]