Changed deserializer to class/instance from class methods.
Addressed more comments.