Improved partials to use local variables instead instance