Explicit X11 cleanup + comments style