Cleaned up some JSONCodec stuff