Update How To and code cleanup.