cleanplot and dataorg are now functions