clean code
add Serializer and its tests
clean code