Cleanup Serialization logic

Signed-off-by: rpgmaker <olamide.bakre@gmail.com>