More arguments cleanup