Fixed several format issues