Basic refactoring into partials