cleanning up ...
refactoring groups
more group refactoring