Move variables around to make setup easier