DRY update
Final tweaks for the day