Refactor + Fix DateUtils.twoNums