got rid of some unnessiary variables