Fix Percent Calculation, cleanup