Clean up overall code. Give credit where credit is due.