Converted instance variables to local ones