Refactor vim movement yet again