Refactor serializerFor to be more consistent
Merge pull request #1175 from tchak/refactor-serializer-for

Refactor serializerFor to be more consistent