Removed TODOs from SortedListModel and ChooseMetricsForm
Removed extra comments from SortedListModel and ChooseMetricsForm