More refactoring; trying to simply this.