Finalize Several Changed for Increased DRYness