Cleaned up defintion file