Updated roxygen blocks and roxygenised

- S3method replaced by export
- roxygenised with 4.0.0
Resolve merge conflict