Fix some formatting issues to conform with R CMD check --as-cran