Code cleanup, ensure consistent rounding operation throughout the application