More refactoring per review with Elliot.