Minor cleanliness improvements