Code cleanup, switched to MultiJson