Continued Clean-Up More Efficient

more of the same stuff… organizing and cleaning up stuff to make it run
better. CPU load now reduced by half!