Fix syntax & whitespace

Prior to this commit we had moved code aroudn without changing the enum
vars , also tried to make heads or tails as to why validate is not
working