Simplify conditionals and streamline naming.