Rename some variables, restructuring some stuff