More tweaks and some restructuring in vimrc