refactored variables