Clean up conditionals for consistency and readability