Fixing format issues