diff --git a/.gitconfig b/.gitconfig
index cc63491..cfc052f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,7 +1,6 @@
 [core]
     excludesfile = ~/.gitignore
     editor = nvim
-    autocrlf = true
 
 [init]
     defaultBranch = master    
diff --git a/.vim/.vimrc b/.vim/.vimrc
index 99d488b..6c15991 100644
--- a/.vim/.vimrc
+++ b/.vim/.vimrc
@@ -84,7 +84,6 @@ call vundle#begin()
     Plugin 'tpope/vim-surround'
     Plugin 'tpope/vim-commentary'
     Plugin 'ap/vim-css-color'
-    Plugin 'ryanoasis/vim-devicons'
     Plugin 'terryma/vim-multiple-cursors'
     Plugin 'preservim/tagbar'
 
diff --git a/Makefile b/Makefile
index 608ae1b..d47dc1b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,19 +18,15 @@ install:
 	ln -s $(PWD)/.tmux.conf ~ || true
 
 vim:
-	ln -s $(PWD)/.vim ~
-	ln -s $(PWD)/.vim/.vimrc ~
-	mkdir -p ~/.config/nvim
-	ln -s $(PWD)/.vim/.vimrc ~/.config/nvim/init.vim
-	git clone https://github.com/VundleVim/Vundle.vim.git $(PWD)/.vim/bundle/Vundle.vim
-	vim +PluginInstall +qall
+	ln -s $(PWD)/.vim ~ && ln -s $(PWD)/.vim/.vimrc ~ || true
+	mkdir -p ~/.config/nvim && ln -s $(PWD)/.vim/.vimrc ~/.config/nvim/init.vim || true
+	git clone https://github.com/VundleVim/Vundle.vim.git $(PWD)/.vim/bundle/Vundle.vim && vim +PluginInstall +qall
 
 clean:
 	rm -rf .ssh doc etc scripts img .gitignore README.md .git
 
 ssh:
-	echo -e "\n" >> ~/.ssh/config
-	cat .ssh/config >> ~/.ssh/config
+	echo -e "\n" >> ~/.ssh/config && cat .ssh/config >> ~/.ssh/config
 
 git:
 	ln -s $(PWD)/.gitconfig ~ || true