Fixed formatting (mostly)