Reorg: extract controller methods.