Config refactoring
Formatting