Code cleanup. Updated copyright comments