Refactor, strip .git extension