Refactor, 10 test passing