PEP8, move heading upgrade to Cascade repo