Reduce code duplication in command-api-v2 (sponge) by introducing a common sub-module and fix some formatting issues

Reduce code duplication in command-api-v2 (sponge) by introducing a common sub-module and fix some formatting issues #957