tidied up definitions