Started clean up process
Merged clean up and JSON encoder class