diff --git a/bashrc b/bashrc
index b22b780..a160999 100644
--- a/bashrc
+++ b/bashrc
@@ -30,12 +30,12 @@ NORMAL='\[\033[00m\]'
 
 if [ -n "$force_color_prompt" ]; then
     if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-        # We have color support; assume it's compliant with Ecma-48
-        # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-        # a case would tend to support setf rather than setaf.)
-        color_prompt=yes
+	# We have color support; assume it's compliant with Ecma-48
+	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+	# a case would tend to support setf rather than setaf.)
+	color_prompt=yes
     else
-        color_prompt=
+	color_prompt=
     fi
 fi
 
@@ -48,41 +48,51 @@ fi
 unset color_prompt force_color_prompt
 
 # If this is an xterm set the title to user@host:dir
-case "$TERM" in xterm*|rxvt*)
+case "$TERM" in
+xterm*|rxvt*)
     PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
-    ;; *)
-    ;; esac
-
+    ;;
+*)
+    ;;
+esac
 
 # enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
     test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
     alias ls='ls -X --color=auto'
-    #alias dir='dir --color=auto' alias vdir='vdir --color=auto'
+    #alias dir='dir --color=auto'
+    #alias vdir='vdir --color=auto'
 
     alias grep='grep --color=auto'
     alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto' fi
+    alias egrep='egrep --color=auto'
+fi
 
 # some more ls aliases
-alias ll='ls -alF' alias la='ls -A' alias l='ls -CF'
+alias ll='ls -alF'
+alias la='ls -A'
+alias l='ls -CF'
 
 # Add an "alert" alias for long running commands.  Use like so:
 #   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e
-'\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
 
-# Alias definitions. You may want to put all your additions into a separate file like ~/.bash_aliases, instead of adding
-# them here directly. See /usr/share/doc/bash-doc/examples in the bash-doc package.
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
 
 if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases fi
+    . ~/.bash_aliases
+fi
 
 alias ftp='yafc'
 
-# enable programmable completion features (you don't need to enable this, if it's already enabled in /etc/bash.bashrc and
-# /etc/profile sources /etc/bash.bashrc).
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
 if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
-    . /etc/bash_completion fi
+    . /etc/bash_completion
+fi
 
 export EDITOR=vim
diff --git a/vimrc b/vimrc
index 4ef61a1..b1498e8 100644
--- a/vimrc
+++ b/vimrc
@@ -12,7 +12,6 @@ if has("autocmd")
     filetype indent on
     filetype plugin on
     set ofu=syntaxcomplete#Complete
-    "autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == \"primary") | q | endif
 endif
 
 " basic options