Cleaning up CoreData saving code

Signed-off-by: pawlakaj <pawlakaj@singledigitlabs.com>