updated function names and cleane dup cli tool