Separating into partials
Refactoring of partials