Refactor if/ifLoop/operation components constructor arguments