Be more explicit with conditionals