slightly cleaner groups commit