@EatKnitSleepAgain That's a great tip! I think that I've sort of been doing this too. I might start to create my own playlists in future for this purpose but for now I've been discovering new music by playing an album.

Also, it is good that you have a cleaner to help, it's like having a friend or coach to keep you on track and so you have someone to support you and motivate you to keep it looking better than it is otherwise.