PEP8 clean up and fixing up the reoderd columns code.