Refactor analysis strategies according to PEP8