Refactoring/PEP8 marketplace_groups