Improve percent.calc