Clean up conditionals