index/notification refac