got rid of unnecessary instance variables