Refactor config for clarity