Refactor Config [WIP]

As above, parens may make these more readable, too.