Fixed all rounding problems and made some stylistic changes