Cleaned up yes/no dictionary