Tidy TreeCare

#343280