Cleanup, refactor, and add a recipe
Might be time for a minor version bump...