Coredata plus refactoring
CoreData plus some refactoring
Some refactoring