Optimize struts calculation slightly