Clean up per the code review by Charles/Mikhail.