reviewer comments and moved more ser/de