Feeds : Some post code review updates