back to vim, and some sanity checking (pep8)