Validate answers and remove extra code