Clean up bool output with conditional