Refactored dotfiles