Tidy up.
Add group method.