data mod whitespace cleanup - there are already many accessibility related changes and fixes that are not backportable anyway and merging from previous versions is not expected