clean up intendation
make group email optional