tidied up things