thirs - tidy ups