Some cleanup
Improve yes/no query