Minor refactoring: putting all arguments in one line