Refactoring (move to double form Double)