Code cleaning, renaming, send to CRAN