refactor
remove dup