More refactoring performed.