Cleanup of arguments