Cleaned up Domain Entities