more small cleanup