More refactoring of several methods.