Refactoring for clarity
Merge branch 'master' of github.com:tomchristie/core-serializers