Refactoring notification creation to not use builder