extracted createArguments() and removed duplicate code
3 files changed