More refactoring, @tremblay, @nsford