Card #187 - refactor