Code clean up
WIP add line
set serialization mode by default