Refactor volume notifications