Minor code cleaning. Fixed git status robustness.