All the changes up to here are unnecessary re-formatting.