Tidying up around config load