Changed some variables to a more decent name