move chnages to Listusers extension, +small code cleanup