Small review and cleanup.