Move some instance variables as locals in partial