Georgi Boshnakov tidy up for CRAN