Fix formatting slightly, although this is still not ideal