Finish refactoring group controller