Simplify to avoid typo errors