Not related to this change, but the indenting is really messed up in these files