More minor cleanup of finder.