Simplified some computed properties