Restructured vim script