Corrected format issues