Improve vim syntax