- refactoring action and parameters of calls to be less complex