better interceptor code/documentation