Update answer type and simplify hint code