refactor Answer class
refactor