Minor consumer refactoring, Readme updates