Mod: update some format to look nice