A few formatting fixes