minor code reorg; remove unnecessary JSON marshallers

Spacing