Refactors, part 1.