Cleaning up format issues