Reorganised and fixed errors from using fugitive incorrectly.