Simplified some expressions