Cleaned up format fix