These remaining conditionals could use comments