Fix alignment of mine counts, simplfy code a bit.