Format some more code