Resuming Serialization + code cleanup