PEP8
More progress refactoring groups and contacts