Remove use of instance variables