Took out unnecessary variable sets