Cleaned up definitions