more post-refactoring tidying up
debugging refactored pussycat