Refactoring for size

Created 7/19/2005, updated 5/18/2017

Did some nice refactoring for size, lopping off a couple hundred lines of source and hopefully reducing the memory footprint of the code.