Some refactorings, renamed HackyEndpoint and renamed on_bypass_message