Updated copyright notes and clean up.