further cleaner up serialization