minor changes make core data save in one method