Better comments and building NotificationSettings object in a smarter way