Improve git status structure and methods