Some formatting fixes