Clean up. Warnings added.