dotfile refactored