vi keys; clean up