[Serializer] Misc cleanup
Merge pull request #27 from vicb/cleanup

[Serializer] Misc cleanup