Refactoring/PEP8 community_*