these next three changes make the source file ugly but make the dest file pretty