Cleanup intercept

Refactored mult-nested clauses mostly