diff --git a/.tmux.conf b/.tmux.conf
index 5baa5e4..de700aa 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -3,6 +3,9 @@ set-option -sg escape-time 10
 set -g default-terminal "xterm-256color"
 set-option -g history-limit 6000
 
+# turn off status line
+set -g status off
+
 set-option -sa terminal-overrides ',xterm-256color:RGB'
 setw -g mode-keys vi
 bind-key -T copy-mode-vi 'v' send -X begin-selection
diff --git a/.vimrc b/.vimrc
index f8db73a..13074c7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -145,6 +145,9 @@
     " set nolist                      " let vim not showing '$' or other sign
     set list                        " Display unprintable characters f12 - switches
 
+    " stop inserting the current comment leader after hitting 'o' or 'O' in Normal mode
+    au FileType java setlocal formatoptions-=o
+
     set listchars=tab:•\ ,trail:•,extends:»,precedes:« " Unprintable chars mapping
 
     "Remove all trailing whitespace by pressing <leader>ws