Got rid of unneccesary variables