Refactor - add enum for yes and no