Tidyup
Corrected serialize
Correct serialization