Format code corrections