Simplified certain expressions, uniformed terms