More cleanup tweaking