vim: code structure minor improvement