fixed format issues