Added current volume to notification
Code Refactor