Some Vim tuning

Sometimes is worth to stop for a while and rethinking if you're doing it 'the right way'