Clean code
Refactoring the GroupListView Code