Some indentation fixed
Some refactoring in vimrc