moved instance variables where they belong