And some formatting fixes