Fixes notification request headers and refactors method/members