Refactored group