Still more cleanup tweaking