tidied up names and removed extra logging