FeedbackService refactoring

FeedbackService.cs refactoring by owner request.