cleaned up definit