make code better
Merge pull request #34 from zxcvdavid/code-better

make code better for vim