Refactor answer controller
Answer Controllers little fix