Simplify Protocol Refactoring

https://wordpress.foojay.io/today/simplify-protocol-refactoring/