tidied up cruft