code improvements in user/update mockup