Improved the percentual calculations