Fix format coding issues