Refactoring webhook handler to be a class method and renaming a few things