TODO
clean up in validator
reviewed some comments
reviewed some comments
reviewed some comments
style fixes
better consumer credentials handling