diff --git a/base/xdisplay_c.h b/base/xdisplay_c.h
index f2178f3..f96e835 100644
--- a/base/xdisplay_c.h
+++ b/base/xdisplay_c.h
@@ -4,11 +4,11 @@
 
 static Display *mainDisplay = NULL;
 static int registered = 0;
+
 static char *displayName = NULL;
 static int hasDisplayNameChanged = 0;
 
-Display *XGetMainDisplay(void)
-{
+Display *XGetMainDisplay(void) {
 	/* Close the display if displayName has changed */
 	if (hasDisplayNameChanged) {
 		XCloseMainDisplay();
@@ -20,7 +20,7 @@ Display *XGetMainDisplay(void)
 		mainDisplay = XOpenDisplay(displayName);
 
 		/* Then try using environment variable DISPLAY */
-		if (mainDisplay == NULL) {
+		if (mainDisplay == NULL && displayName != NULL) {
 			mainDisplay = XOpenDisplay(NULL);
 		}
 
@@ -40,22 +40,19 @@ Display *XGetMainDisplay(void)
 	return mainDisplay;
 }
 
-void XCloseMainDisplay(void)
-{
+void XCloseMainDisplay(void) {
 	if (mainDisplay != NULL) {
 		XCloseDisplay(mainDisplay);
 		mainDisplay = NULL;
 	}
 }
 
-void setXDisplay(char *name)
-{
+void setXDisplay(char *name) {
 	displayName = strdup(name);
 	hasDisplayNameChanged = 1;
 }
 
-char *getXDisplay(void)
-{
+char *getXDisplay(void) {
 	return displayName;
 }
 
diff --git a/robotgo_mac.go b/robotgo_mac_unix.go
similarity index 100%
rename from robotgo_mac.go
rename to robotgo_mac_unix.go
diff --git a/robotgo_unix.go b/robotgo_x11.go
similarity index 100%
rename from robotgo_unix.go
rename to robotgo_x11.go