Refactoring : Math