Fix PEP8 errors from newly merged code