Refactor configuration a bit.