More refctoring.