Replacing 'bad' characters in group name. Fixes #7
Some refactoring