Refactoring arguments to simplify clusters' implementation