diff --git a/src/prefs/mouse/Mouse.cpp b/src/prefs/mouse/Mouse.cpp
index 14318a172b..319a4d434b 100644
--- a/src/prefs/mouse/Mouse.cpp
+++ b/src/prefs/mouse/Mouse.cpp
@@ -20,23 +20,16 @@
 #include "Mouse.h"
 #include "MouseWindow.h"
 
+
 const char kMouseApplicationSig[] = "application/x-vnd.OpenBeOS-MOUS";
 
-int main(int, char**)
-{
-	MouseApplication	myApplication;
-
-	myApplication.Run();
-
-	return(0);
-}
 
 MouseApplication::MouseApplication()
-					:BApplication(kMouseApplicationSig)					
+	: BApplication(kMouseApplicationSig)					
 {
 	BRect rect(0, 0, 397, 293);
 	MouseWindow *window = new MouseWindow(rect);
-	window->MoveTo(window->fSettings.WindowCorner());
+	window->MoveTo(window->fSettings.WindowPosition());
 
 	window->Show();
 }
@@ -47,3 +40,16 @@ MouseApplication::AboutRequested(void)
 {
 	(new BAlert("about", "...by Andrew Edward McCall", "Dig Deal"))->Go();
 }
+
+
+//	#pragma mark -
+
+
+int
+main(int /*argc*/, char **/*argv*/)
+{
+	MouseApplication app;
+	app.Run();
+
+	return 0;
+}
diff --git a/src/prefs/mouse/Mouse.h b/src/prefs/mouse/Mouse.h
index 304fe3250d..c150eb7c34 100644
--- a/src/prefs/mouse/Mouse.h
+++ b/src/prefs/mouse/Mouse.h
@@ -13,19 +13,19 @@
 //	Modified : December 10, 2003
 // 
 // ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
-
 #ifndef MOUSE_H
 #define MOUSE_H
 
+
 #include <Application.h>
-#include "MouseWindow.h"
+
 
 class MouseApplication : public BApplication 
 {
-public:
-	MouseApplication();
-	
-	void AboutRequested(void);
+	public:
+		MouseApplication();
+
+		virtual void AboutRequested(void);
 };
 
-#endif
+#endif	/* MOUSE_H */