Refactor again based on a second review from Chris.