Added arguments formatter
Review made