Refactoring

Refactored some configuration settings