Cleaned up design on grouping methods.