diff --git a/AppKit/CPCollectionView.j b/AppKit/CPCollectionView.j
index 943c05a30..b7ff621d0 100644
--- a/AppKit/CPCollectionView.j
+++ b/AppKit/CPCollectionView.j
@@ -60,6 +60,8 @@ var CPCollectionViewDelegate_collectionView_acceptDrop_index_dropOperation_
 
 @end
 
+var HORIZONTAL_MARGIN = 2;
+
 /*!
     @ingroup appkit
     @class CPCollectionView
@@ -88,9 +90,6 @@ var CPCollectionViewDelegate_collectionView_acceptDrop_index_dropOperation_
     @param indices the indices to obtain drag types
     @return an array of drag types (CPString)
 */
-
-var HORIZONTAL_MARGIN = 2;
-
 @implementation CPCollectionView : CPView
 {
     CPArray                         _content;
diff --git a/AppKit/CPPanel.j b/AppKit/CPPanel.j
index 89a8f0355..d371ea7a4 100644
--- a/AppKit/CPPanel.j
+++ b/AppKit/CPPanel.j
@@ -26,6 +26,8 @@
 CPOKButton      = 1;
 CPCancelButton  = 0;
 
+CPDocModalWindowMask    = 1 << 6;
+
 /*!
     @ingroup appkit
     @class CPPanel
@@ -51,8 +53,6 @@ CPCancelButton  = 0;
     @global
     @class CPWindow
 */
-CPDocModalWindowMask    = 1 << 6;
-
 @implementation CPPanel : CPWindow
 {
     BOOL    _becomesKeyOnlyIfNeeded;
diff --git a/AppKit/CPRadio.j b/AppKit/CPRadio.j
index 5b40fa8ed..cd5f5196d 100644
--- a/AppKit/CPRadio.j
+++ b/AppKit/CPRadio.j
@@ -29,6 +29,7 @@
 
 @global CPApp
 
+CPRadioImageOffset = 4.0;
 
 /*!
     @ingroup appkit
@@ -67,9 +68,6 @@
     option.
 
 */
-
-CPRadioImageOffset = 4.0;
-
 @implementation CPRadio : CPButton
 {
     CPRadioGroup    _radioGroup;
diff --git a/AppKit/CPScrollView.j b/AppKit/CPScrollView.j
index 90a8c9b2a..1b34e8658 100644
--- a/AppKit/CPScrollView.j
+++ b/AppKit/CPScrollView.j
@@ -86,15 +86,6 @@ var _isBrowserUsingOverlayScrollers = function()
 #endif
 };
 
-/*!
-    @ingroup appkit
-    @class CPScrollView
-
-    Used to display views that are too large for the viewing area. the CPScrollView
-    places scroll bars on the side of the view to allow the user to scroll and see the entire
-    contents of the view.
-*/
-
 var TIMER_INTERVAL                              = 0.2,
     CPScrollViewDelegate_scrollViewWillScroll_  = 1 << 0,
     CPScrollViewDelegate_scrollViewDidScroll_   = 1 << 1,
@@ -104,7 +95,14 @@ var TIMER_INTERVAL                              = 0.2,
 var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
     CPScrollerStyleGlobalChangeNotification     = @"CPScrollerStyleGlobalChangeNotification";
 
+/*!
+    @ingroup appkit
+    @class CPScrollView
 
+    Used to display views that are too large for the viewing area. the CPScrollView
+    places scroll bars on the side of the view to allow the user to scroll and see the entire
+    contents of the view.
+*/
 @implementation CPScrollView : CPView
 {
     CPClipView                  _contentView;
diff --git a/AppKit/CPScroller.j b/AppKit/CPScroller.j
index f293b34dd..98110ef5f 100644
--- a/AppKit/CPScroller.j
+++ b/AppKit/CPScroller.j
@@ -50,11 +50,6 @@ CPNoScrollerParts           = 0;
 CPOnlyScrollerArrows        = 1;
 CPAllScrollerParts          = 2;
 
-/*!
-    @ingroup appkit
-    @class CPScroller
-*/
-
 var PARTS_ARRANGEMENT   = [CPScrollerKnobSlot, CPScrollerDecrementLine, CPScrollerIncrementLine, CPScrollerKnob],
     NAMES_FOR_PARTS     = {},
     PARTS_FOR_NAMES     = {};
@@ -78,6 +73,11 @@ CPThemeStateScrollViewLegacy    = CPThemeState("scroller-style-legacy");
 CPThemeStateScrollerKnobLight   = CPThemeState("scroller-knob-light");
 CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
+/*!
+    @ingroup appkit
+    @class CPScroller
+*/
+
 @implementation CPScroller : CPControl
 {
     CPUsableScrollerParts   _usableParts;