chore: better code reuse in callback

[alexradzin]

Small code improvement: created implementation of Consumer that is used 3 times as a callback. The removes the code duplication.

[jimexist]

you probably need to run spotless apply first