Refactoring: Settings consolidation, better readability