PEP8 cleanup. Remove consts for strings as they are interned anyways