simplified expressions / reorganization / json syntax