More minor miner refactoring