make notification -> message linkage less spaghetti