Refactored variable patterns