Refactor Config [WIP]

Typo