diff --git a/setup.sh b/setup.sh
index 978693d..5549407 100755
--- a/setup.sh
+++ b/setup.sh
@@ -11,12 +11,12 @@
 sudo apt autoremove
 
 echo "Copying config files..."
-cp -v .tmux.conf ~/
-cp -v .gitconfig ~/
-mkdir ~/.config/fish ~/.emacs.d ~/.ssh
-cp -v config.fish ~/.config/fish/
-cp -v init.el ~/.emacs.d/
-cp -v config ~/.ssh/
+cp -v -t ~/ .tmux.conf
+cp -v -t ~/ .gitconfig
+mkdir ~/.config ~/.config/fish ~/.emacs.d ~/.ssh
+cp -v -t ~/.config/fish/ config.fish
+cp -v -t ~/.emacs.d/ init.el
+cp -v -t ~/.ssh/ config
 
 echo "Setting up fish shell..."
 chsh -s /usr/bin/fish
@@ -26,7 +26,8 @@
 tar xzf julia-0.6.3-linux-x86_64.tar.gz
 sudo mkdir /usr/local/lib/julia
 sudo mv julia-d55cadc350/* /usr/local/lib/julia
-sudo rm -r julia-d55cadc350
+rmdir julia-d55cadc350
+rm julia-0.6.3-linux-x86_64.tar.gz
 sudo ln -s /usr/local/lib/julia/bin/julia /usr/local/bin/julia
 echo "Don't forget to install julia-mode in emacs! (M-x package-install)"