Got rid of a few vars and nulls!