Add a basic mapping system to correct for bad channel names.
PEP8 fixes