PEP8 fixes in main + chasing bug in GA