31 passed/ refactor