refactor finished: green