fixed all format issues