Consumer cleaned up and refactored for new system