#17: Refactor