Cosmetic changes
Prep. for full CRAN-compliance