- move common arguments to a shared struct - remove unused fields - fix outdated names - improve logging/error handling