Update and Refactor for readability

Hey there,

This PR introduces:
* Improved readability for Interceptor
* Refactored specs for better testing in isolation