Refactor, add word problems with random names