fixed duplication bugs
updated format unification