Data Model Fix

Upon original commit the xcdatamodel file was missing.
Clean Up

Cleaning up code.