diff --git a/tmux.conf b/tmux.conf
index 05a747e..042ebf6 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -15,7 +15,7 @@ set default-path "$HOME" # not work as i expected
 
 #set -g status-left ""
 #set -g status-right "#H | %a, %d %b %Y %T %z #(tmux -V)"
-set -g status-right "#(whoami)@#H | #(tmux -V) "
+set -g status-right "${USER}@#H | #(tmux -V) "
 set message-bg black
 set message-fg yellow
 
@@ -23,11 +23,15 @@ set -g set-titles on
 
 set -g status-bg green
 set -g status-fg white
-if "test `hostname` = arch-aspireone" "set -g status-bg blue; set -g pane-active-border-fg blue"
-if "test `hostname` = darwin-mba.local" "set -g status-bg yellow; set -g pane-active-border-fg yellow; set -g status-fg black"
-if "test `hostname` = newkiwi" "set -g status-bg magenta; set -g pane-active-border-fg magenta"
-
-if "test -f /opt/local/bin/reattach-to-user-namespace" "set-option -g default-command '/opt/local/bin/reattach-to-user-namespace bash'"
+if "test `hostname` = arch-aspireone"
+    "set -g status-bg blue; set -g pane-active-border-fg blue"
+if "test `hostname` = darwin-mba.local"
+    "set -g status-bg yellow; set -g pane-active-border-fg yellow; set -g status-fg black"
+if "test `hostname` = newkiwi"
+    "set -g status-bg magenta; set -g pane-active-border-fg magenta"
+
+if "test -f /opt/local/bin/reattach-to-user-namespace"
+    "set-option -g default-command '/opt/local/bin/reattach-to-user-namespace bash'"
 
 # window-status-current
 setw -g window-status-current-fg black