Moved notification logic to seperate class