formatting
completed group refactor