Fixed formatting

(plus some other stuff)