further tidy ups