Refactor state lists into partials