Eliminated unnecessary instance variables