[OPR-160]: Little bit of refactoring.
[OPR-160]: Little bit of refactoring.

ProcedureKit/ProcedureKit,cezarywojcik/Operations,blg-andreasbraun/Operations,danthorpe/Operations,cezarywojcik/Operations,danthorpe/Operations,ProcedureKit/ProcedureKit,blg-andreasbraun/ProcedureKit,danthorpe/Operations,cezarywojcik/Operations,blg-andreasbraun/ProcedureKit,blg-andreasbraun/Operations,ProcedureKit/ProcedureKit,blg-andreasbraun/ProcedureKit,blg-andreasbraun/Operations