Refactor w/ partials: variables, images