organize updater code