Add dash and s
remove duplicated lines