vim: minor re-arranging