Card #168 - refactor