Touchup some code.