updated consumer module following code review