refactored variables again