Some more cleanups (hlinted)