Yet another formatting fix attempt