[7] Refactor