cleaning up definitions