GREEN / REFACTOR