General-purpose cleanup.  Hooray for legibility!