vim: style cleanup
vim: fix undo