more tweaks to make process cleaner