working partials
code cleanup