Improved vim script