Refactor answers, tests, green