Made some variabels that didn't need to be