Clean interceptor code