Updated some variables to be a little more specific