Simplify naming
Outsource group manipulation to third-party package
Streamline further