Refine calculations