Code cleanup and license notice format update