Simplified two of the expressions