Added jsonify, comments
cleanup