Merge "A method refactoring and a simple rounding fix."