format issues fixed