Card #104 - refactor