vim: tidy it a little bit further