More refactering.