Move variables to own partial