Refactor/configuration separation of concerns