Dotfiles should be working properly now
Renamed some vars so it's more readable