tidied up objects