Further formatting fixes