Some minor changes and cleaning withing data-grinder