Clean up based on feedback from Refael Ackermann.