refactor: cleanup arguments namespace