Prepare interceptor architecture; code cleanup