Code cleanup and adjustments

Attempts to clean up the code, make it a little faster, and some code
reduction.  Introduced a bug in the process, will need to fix later by
either reverting to old method of creating object (in each Try
statement), or using some other yet to be determined method.