tidied up some stuff