diff --git a/src/core/feedsproxymodel.cpp b/src/core/feedsproxymodel.cpp
index bb1af1066..41838b529 100755
--- a/src/core/feedsproxymodel.cpp
+++ b/src/core/feedsproxymodel.cpp
@@ -50,6 +50,7 @@ bool FeedsProxyModel::lessThan(const QModelIndex &left,
       }
       else {
         // In other cases, sort by title.
+        // TODO: mozna pouzit QString::localeAwareCompare tady.
         return left_item->title() < right_item->title();
       }
     }
diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp
index 1894159d4..ab4a1af02 100644
--- a/src/core/messagesmodel.cpp
+++ b/src/core/messagesmodel.cpp
@@ -22,7 +22,7 @@ MessagesModel::MessagesModel(QObject *parent)
 
   // Set desired table and edit strategy.
   // NOTE: Changes to the database are actually NOT submitted
-  // via model, but DIRECT SQL calls are used to do persistent messages.
+  // via model, but via DIRECT SQL calls are used to do persistent messages.
   setEditStrategy(QSqlTableModel::OnManualSubmit);
   setTable("Messages");
   loadMessages(QList<int>());
diff --git a/src/core/messagesproxymodel.cpp b/src/core/messagesproxymodel.cpp
index 7370b6ad2..51936c8c9 100644
--- a/src/core/messagesproxymodel.cpp
+++ b/src/core/messagesproxymodel.cpp
@@ -26,6 +26,8 @@ MessagesModel *MessagesProxyModel::sourceModel() {
 }
 
 bool MessagesProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const {
+  // TODO: mozna pouzit QString::localeAwareCompare tady
+  // pro title a author.
   return QSortFilterProxyModel::lessThan(left, right);
 }
 
diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp
index 242c05ae7..9428db0d7 100644
--- a/src/gui/feedsview.cpp
+++ b/src/gui/feedsview.cpp
@@ -187,11 +187,14 @@ void FeedsView::setupAppearance() {
   setExpandsOnDoubleClick(true);
   setEditTriggers(QAbstractItemView::NoEditTriggers);
   setIndentation(10);
-  sortByColumn(0, Qt::AscendingOrder);
   setDragDropMode(QAbstractItemView::NoDragDrop);
   setAllColumnsShowFocus(true);
   setSelectionMode(QAbstractItemView::ExtendedSelection);
   setRootIsDecorated(false);
+
+  // Sort in ascending order, that is categories are
+  // "bigger" than feeds.
+  sortByColumn(0, Qt::AscendingOrder);
 }
 
 void FeedsView::selectionChanged(const QItemSelection &selected,
@@ -240,4 +243,6 @@ void FeedsView::drawBranches(QPainter *painter, const QRect &rect, const QModelI
   Q_UNUSED(rect)
   Q_UNUSED(index);
   // NOTE: Don't draw branches at all.
+  // TODO: tady mozna nakreslit proste ten rect s tim painterem
+  // aby tam aspon neco bylo (blbne pak skrz stylesheety)
 }
diff --git a/src/gui/formmain.h b/src/gui/formmain.h
index d3a201a98..ebbd76194 100644
--- a/src/gui/formmain.h
+++ b/src/gui/formmain.h
@@ -45,8 +45,6 @@ class FormMain : public QMainWindow {
     bool event(QEvent *event);
 
     // Sets up proper icons for this widget.
-    // NOTE: All permanent widgets should implement this
-    // kind of method and catch ThemeFactoryEvent::type() in its event handler.
     void setupIcons();
 
     // Loads/saves visual state of the application.
diff --git a/src/gui/iconthemefactory.h b/src/gui/iconthemefactory.h
index 220dbe1c8..bbeeeb5fa 100755
--- a/src/gui/iconthemefactory.h
+++ b/src/gui/iconthemefactory.h
@@ -25,14 +25,11 @@ class IconThemeFactory : public QObject {
     void setupSearchPaths();
 
     // Returns list of installed themes, including "default" theme.
-    // NOTE: "Default" theme is system theme on Linux and "no theme" on windows.
     QStringList getInstalledIconThemes();
 
     // Loads name of selected icon theme (from settings) for the application and
     // activates it. If that particular theme is not installed, then
     // "default" theme is loaded.
-    // NOTE: All existing widgets get a chance to repaint its icons if
-    // notify_widgets is true.
     void loadCurrentIconTheme();
 
     // Returns name of currently activated theme for the application.
diff --git a/src/gui/skinfactory.h b/src/gui/skinfactory.h
index 527e78305..c0e4832ac 100644
--- a/src/gui/skinfactory.h
+++ b/src/gui/skinfactory.h
@@ -23,9 +23,6 @@ Q_DECLARE_METATYPE(Skin)
 // NOTE: Skin "base/vergilius.xml" is now NEEDED for rssguard
 // to run. IT IS DEFAULT skin. It sets no styles and stylesheet.
 // It just contains markup for webbrowser.
-// NOTE: Check skins "base/vergilius.xml" and "luxuous.xml"
-// for skin syntax reference. Note that <markup> and <data> tags
-// have contents encoded in Base64.
 
 class SkinFactory : public QObject {
     Q_OBJECT