Converting to devtools conventions / roxygen