Some minor changes and cleaning within data-grinder