Refactor org setup
Remove commented code
Refactor git-gutter setup