Substitute improvements (:s/foo/bar)
Clean up