diff --git a/libraries/render-utils/src/OffscreenUi.cpp b/libraries/render-utils/src/OffscreenUi.cpp
index 5fb2773d31..d63f3330e9 100644
--- a/libraries/render-utils/src/OffscreenUi.cpp
+++ b/libraries/render-utils/src/OffscreenUi.cpp
@@ -239,17 +239,17 @@ void OffscreenUi::updateQuick() {
     emit textureUpdated(fbo->texture());
 }
 
-QPointF OffscreenUi::mapWindowToUi(const QPointF& p, QObject* dest) {
+QPointF OffscreenUi::mapWindowToUi(const QPointF& sourcePosition, QObject* sourceObject) {
     vec2 sourceSize;
-    if (dynamic_cast<QWidget*>(dest)) {
-        sourceSize = toGlm(((QWidget*)dest)->size());
-    } else if (dynamic_cast<QWindow*>(dest)) {
-        sourceSize = toGlm(((QWindow*)dest)->size());
+    if (dynamic_cast<QWidget*>(sourceObject)) {
+        sourceSize = toGlm(((QWidget*)sourceObject)->size());
+    } else if (dynamic_cast<QWindow*>(sourceObject)) {
+        sourceSize = toGlm(((QWindow*)sourceObject)->size());
     }
-    vec2 pos = toGlm(p);
-    pos /= sourceSize;
-    pos *= vec2(toGlm(_quickWindow->size()));
-    return QPointF(pos.x, pos.y);
+    vec2 offscreenPosition = toGlm(sourcePosition);
+    offscreenPosition /= sourceSize;
+    offscreenPosition *= vec2(toGlm(_quickWindow->size()));
+    return QPointF(offscreenPosition.x, offscreenPosition.y);
 }
 
 ///////////////////////////////////////////////////////
@@ -257,39 +257,42 @@ QPointF OffscreenUi::mapWindowToUi(const QPointF& p, QObject* dest) {
 // Event handling customization
 //
 
-bool OffscreenUi::eventFilter(QObject* dest, QEvent* e) {
+bool OffscreenUi::eventFilter(QObject* originalDestination, QEvent* event) {
     // Only intercept events while we're in an active state
     if (_paused) {
         return false;
     }
 
     // Don't intercept our own events, or we enter an infinite recursion
-    if (dest == _quickWindow) {
+    if (originalDestination == _quickWindow) {
         return false;
     }
     
-    switch (e->type()) {
+    switch (event->type()) {
         case QEvent::Resize: {
-            QResizeEvent* re = (QResizeEvent*)e;
-            QGLWidget* widget = dynamic_cast<QGLWidget*>(dest);
+            QResizeEvent* resizeEvent = (QResizeEvent*)event;
+            QGLWidget* widget = dynamic_cast<QGLWidget*>(originalDestination);
             if (widget) {
-                this->resize(re->size());
+                this->resize(resizeEvent->size());
             }
             return false;
         }
 
         case QEvent::KeyPress:
         case QEvent::KeyRelease: {
-            e->ignore();
-            if (QCoreApplication::sendEvent(_quickWindow, e)) {
-                return e->isAccepted();
+            event->ignore();
+            if (QCoreApplication::sendEvent(_quickWindow, event)) {
+                return event->isAccepted();
             }
             break;
         }
 
         case QEvent::Wheel: {
-            QWheelEvent* we = (QWheelEvent*)e;
-            QWheelEvent mappedEvent(mapWindowToUi(we->pos(), dest), we->delta(), we->buttons(), we->modifiers(), we->orientation());
+            QWheelEvent* wheelEvent = (QWheelEvent*)event;
+            QWheelEvent mappedEvent(
+                    mapWindowToUi(wheelEvent->pos(), originalDestination),
+                    wheelEvent->delta(),  wheelEvent->buttons(),
+                    wheelEvent->modifiers(), wheelEvent->orientation());
             QCoreApplication::sendEvent(_quickWindow, &mappedEvent);
             return true;
         }
@@ -299,12 +302,15 @@ bool OffscreenUi::eventFilter(QObject* dest, QEvent* e) {
         case QEvent::MouseButtonPress:
         case QEvent::MouseButtonRelease:
         case QEvent::MouseMove: {
-            QMouseEvent* me = (QMouseEvent *)e;
-            QPointF originalPos = me->localPos();
+            QMouseEvent* mouseEvent = (QMouseEvent *)event;
+            QPointF originalPos = mouseEvent->localPos();
             QPointF transformedPos = _mouseTranslator(originalPos);
-            QMouseEvent mappedEvent(e->type(), mapWindowToUi(transformedPos, dest), me->screenPos(), me->button(), me->buttons(), me->modifiers());
+            QMouseEvent mappedEvent(mouseEvent->type(),
+                    mapWindowToUi(transformedPos, originalDestination),
+                    mouseEvent->screenPos(), mouseEvent->button(),
+                    mouseEvent->buttons(), mouseEvent->modifiers());
             QCoreApplication::sendEvent(_quickWindow, &mappedEvent);
-            return QObject::event(e);
+            return QObject::event(event);
         }
 
         default:
@@ -352,7 +358,7 @@ void OffscreenUi::show(const QUrl& url, const QString& name) {
 void OffscreenUi::toggle(const QUrl& url, const QString& name) {
     QQuickItem* item = _rootItem->findChild<QQuickItem*>(name);
     // First load?
-    if (nullptr == item) {
+    if (!item) {
         load(url);
         return;
     }
diff --git a/libraries/render-utils/src/OffscreenUi.h b/libraries/render-utils/src/OffscreenUi.h
index 16db24e5ae..d86f99554e 100644
--- a/libraries/render-utils/src/OffscreenUi.h
+++ b/libraries/render-utils/src/OffscreenUi.h
@@ -67,16 +67,16 @@ public:
     void toggle(const QUrl& url, const QString& name);
     void setBaseUrl(const QUrl& baseUrl);
     void addImportPath(const QString& path);
-    QQmlContext * qmlContext();
+    QQmlContext* qmlContext();
 
     void pause();
     void resume();
     bool isPaused() const;
     void setProxyWindow(QWindow* window);
-    QPointF mapWindowToUi(const QPointF& p, QObject* dest);
-    virtual bool eventFilter(QObject* dest, QEvent* e);
-    void setMouseTranslator(MouseTranslator mt) {
-        _mouseTranslator = mt;
+    QPointF mapWindowToUi(const QPointF& sourcePosition, QObject* sourceObject);
+    virtual bool eventFilter(QObject* originalDestination, QEvent* event);
+    void setMouseTranslator(MouseTranslator mouseTranslator) {
+        _mouseTranslator = mouseTranslator;
     }
 
 
@@ -130,7 +130,7 @@ private:
     FboCache _fboCache;
     bool _polish{ true };
     bool _paused{ true };
-    MouseTranslator _mouseTranslator{ [](const QPointF & p) { return p;  } };
+    MouseTranslator _mouseTranslator{ [](const QPointF& p) { return p;  } };
 };
 
 #endif
diff --git a/libraries/render-utils/src/RenderUtil.h b/libraries/render-utils/src/RenderUtil.h
index 74d6c23791..8c1b1e12e7 100644
--- a/libraries/render-utils/src/RenderUtil.h
+++ b/libraries/render-utils/src/RenderUtil.h
@@ -37,7 +37,7 @@ void withProjectionIdentity(F f) {
 }
 
 template <typename F>
-void withProjectionMatrix(GLfloat * matrix, F f) {
+void withProjectionMatrix(GLfloat* matrix, F f) {
     withProjectionPush([&] {
         glLoadMatrixf(matrix);
         f();
@@ -58,7 +58,7 @@ void withModelviewIdentity(F f) {
 }
 
 template <typename F>
-void withModelviewMatrix(GLfloat * matrix, F f) {
+void withModelviewMatrix(GLfloat* matrix, F f) {
     withModelviewPush([&] {
         glLoadMatrixf(matrix);
         f();