refactoring and add show untracked files (-)