Slight refactor on interceptor setup to be tidier.