refactor consumerImpl and fix others according to it
Merge branch 'master' of github.com:loclamor/fenwicklife