More cleaning

Deleted some old commented code.  Refractored a function or two.  Much
prettier now.