some refactoring
Merge branch 'master' of github.com:brendanjcaffrey/core-data-in-motion