Cleanup: option -> argument