Fixing partials so no instance variables are used