rename add to consume
cleanup refactoring