More Cleanup on format