Serializer refactored, one example revised to use serializer, any comments added, any code reformatted;