tidy up, switch to Roxygen