More refactoring of arguments