diff --git a/dgl/Widget.hpp b/dgl/Widget.hpp
index 93f12701..5cb69b6a 100644
--- a/dgl/Widget.hpp
+++ b/dgl/Widget.hpp
@@ -19,27 +19,19 @@
 
 #include "Events.hpp"
 
-// -----------------------------------------------------------------------
-// Forward class names
-
-// #ifdef DISTRHO_DEFINES_H_INCLUDED
-// START_NAMESPACE_DISTRHO
-// class UI;
-// END_NAMESPACE_DISTRHO
-// #endif
-
 START_NAMESPACE_DGL
 
+// --------------------------------------------------------------------------------------------------------------------
+// Forward class names
+
 class Application;
-// class NanoWidget;
-class Window;
-// class StandaloneWindow;
 class SubWidget;
 class TopLevelWidget;
+class Window;
 
 using namespace Events;
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 
 /**
    Base DGL Widget class.
@@ -85,9 +77,9 @@ public:
     bool isVisible() const noexcept;
 
    /**
-      Set widget visible (or not) according to @a yesNo.
+      Set widget visible (or not) according to @a visible.
     */
-    void setVisible(bool yesNo);
+    void setVisible(bool visible);
 
    /**
       Show widget.
@@ -234,34 +226,13 @@ protected:
 private:
     struct PrivateData;
     PrivateData* const pData;
-
-//     friend class NanoWidget;
-//     friend class Window;
-//     friend class StandaloneWindow;
     friend class SubWidget;
     friend class TopLevelWidget;
-// #ifdef DISTRHO_DEFINES_H_INCLUDED
-//     friend class DISTRHO_NAMESPACE::UI;
-// #endif
 
     DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(Widget)
 };
 
-#if 0
-    // TODO: should we remove this?
-   /**
-      Get this widget's window application.
-      Same as calling getParentWindow().getApp().
-    */
-    Application& getParentApp() const noexcept;
-
-   /**
-      Get parent window, as passed in the constructor.
-    */
-    Window& getParentWindow() const noexcept;
-#endif
-
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 
 END_NAMESPACE_DGL
 
diff --git a/dgl/src/Widget.cpp b/dgl/src/Widget.cpp
index 5b7f16e7..c00e3a97 100644
--- a/dgl/src/Widget.cpp
+++ b/dgl/src/Widget.cpp
@@ -19,7 +19,7 @@
 
 START_NAMESPACE_DGL
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 // Widget
 
 Widget::Widget(TopLevelWidget* const topLevelWidget)
@@ -38,12 +38,12 @@ bool Widget::isVisible() const noexcept
     return pData->visible;
 }
 
-void Widget::setVisible(bool yesNo)
+void Widget::setVisible(bool visible)
 {
-    if (pData->visible == yesNo)
+    if (pData->visible == visible)
         return;
 
-    pData->visible = yesNo;
+    pData->visible = visible;
     repaint();
 }
 
@@ -124,11 +124,13 @@ void Widget::setSize(const Size<uint>& size) noexcept
 
 Application& Widget::getApp() const noexcept
 {
+    DISTRHO_SAFE_ASSERT(pData->topLevelWidget != nullptr);
     return pData->topLevelWidget->getApp();
 }
 
 Window& Widget::getWindow() const noexcept
 {
+    DISTRHO_SAFE_ASSERT(pData->topLevelWidget != nullptr);
     return pData->topLevelWidget->getWindow();
 }
 
@@ -185,34 +187,6 @@ void Widget::onResize(const ResizeEvent&)
 {
 }
 
-// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
-#if 0
-Widget::Widget(Widget* groupWidget)
-    : pData(new PrivateData(this, groupWidget->getParentWindow(), groupWidget, true))
-{
-}
-
-Widget::Widget(Widget* groupWidget, bool addToSubWidgets)
-    : pData(new PrivateData(this, groupWidget->getParentWindow(), groupWidget, addToSubWidgets))
-{
-}
-
-Window& Widget::getParentWindow() const noexcept
-{
-    return pData->parent;
-}
-
-void Widget::setNeedsFullViewport()
-{
-    pData->needsFullViewport = true;
-}
-#endif
-
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 
 END_NAMESPACE_DGL
diff --git a/dgl/src/WidgetPrivateData.cpp b/dgl/src/WidgetPrivateData.cpp
index a5e7b5fb..300f8112 100644
--- a/dgl/src/WidgetPrivateData.cpp
+++ b/dgl/src/WidgetPrivateData.cpp
@@ -94,12 +94,12 @@ void Widget::PrivateData::giveMouseEventForSubWidgets(Events::MouseEvent& ev)
 
 // -----------------------------------------------------------------------
 
-TopLevelWidget* Widget::PrivateData::findTopLevelWidget(Widget* const w)
+TopLevelWidget* Widget::PrivateData::findTopLevelWidget(Widget* const pw)
 {
-    if (w->pData->topLevelWidget != nullptr)
-        return w->pData->topLevelWidget;
-    if (w->pData->parentWidget != nullptr)
-        return findTopLevelWidget(w->pData->parentWidget);
+    if (pw->pData->topLevelWidget != nullptr)
+        return pw->pData->topLevelWidget;
+    if (pw->pData->parentWidget != nullptr)
+        return findTopLevelWidget(pw->pData->parentWidget);
     return nullptr;
 }