cleaning up the config stuf - minor refactoring - docsf