More refactoring. Just looking at setters now