remove duplicate target, simplify variables initialization
update