lots of code cleanups and refactored configuration settings