Removed some duplication
Simplified expression