Fix dupe
Format some stuffs