fix some format issues