Refactor out configuration