Cleaner version of the serializer
Bug fixed
Cleanup