#35 - Refactor