fixing format issues